bug fix and UI tweaks