bug fixes for ui