Minor ui fixes

A few minor fixes requested and the following bugs DSC-841, DSC-1026.