Cleaned up Menu.

Made three properties into methods.