Minor UX fixes

Minor UX fixes