Remove tabs from Settings, small visual enhancements