bug fix and UI polished