Fixed the broker1 UI and adjust ui for topic page - #issue1130