BISERVER-8570 Fixed some of the ui related issues