addressed various UI issues from ticket #20