Tweak and appearance fixes