bugs fix and UI change