minor restructure of settings bar