bug fix and ui change