Fixing the UI