#33 - small ui changes