Add UX fixes for the Data Tool