changes from UI review with Dave