#29: UI fixes