Fixes for LayerSwitch layout
Fixed various layout bugs and components