Fixes related to UX issues
Minor fixes