Some simple UX fixes