Fixing UX elements