Some UI improvements for 0.1.5