The custom layout is only getting corrupted if command buttons are added to the top bar. Using the command buttons as widgets instead allows for my custom layout to persist between reboots.