OmniSwitch: rambar cleanup and layout rework