made buttons invisible in the layout screen if they are disabled
Merge pull request #4257 from bollu/control-layout-improvements

Control layout improvements