Added UX fixes