fixes to UI, should be ok now.