Changes in UI and bug fixes