Cleaned up menus and buttons.

I think at this point most of the functional requirements are added.
The thing to do now is start the final setup of the project and
	the final cleanup.