Fixed some nasty bugs

Also added tray icon for when you press close. In order to close the app you will now have to right click on the tray and close it.