Fixed the ui more