Cleaned up menu and settings layout