UI improvements Fixed#4