UI behaviour and appearance fixes