Fixing UX issues