Corrected Several UX issues