Cleaned up some methods related to the Menu
Fixed wrong slots being displayed on the Menu
Started working on a new way to handle different window types
More work on the generic Window class