More UX fixes for the Data Tool