changes in UI and some bug fixes