polish and UI cleanup