#34 and more appearance tweaks