various UI work fix