Small changes after 1st UI review