bug fix and UI cleleanup