Cleaned up settings menu and dialog