change labels, added price input box. Reformat (that's why the diff contains many changes)