Cleaned up code in menu view.