more fixes to the ui