Messenger and Starter refactoring

+minor changes to MainWindow