bug fixed and UI improvements