more bug fixes on the ui