UI bug fixes with UI polishing