data models + front end improvements