Massive update

Added a new window, all windows now close when MainWindow is closed