#42: Consistency UX fixes