Mostly mode change fix.
Appearance fixes.