Added ability to calculate tip % and avg tip %