minor changes to the UI and bug fixes