moved some add buttons and minor wording & styling changes