Cleaned up settings menu