Fixed some UX issues