#130 - minor UI bug fixes