small fixes to ui bugs, some cleanup