Added price+tax and total - refactored db