#39 and #40 UI fixes