Fixed UX issues