couple of fixes to the UI