fixed email, fixed total price, merged in new views