Reorganized settings menu