More tweaks, fixes for flymode
Message styles
Cleanup imports