#3 Some UI improvements