Cleaned up menu and code.