Fixing the ui