Commit 2

Notification for last change
Still too much in MainWindow