Appearance tweaks mostly

Currently mergable.