Fix the ui