Refactored widgets to make room for system tray