UI fixes :lipstick: :+1: