Fixed system tray icon not showing up on Windows.

Also moved things around a bit.