fix layout issue and include sales tax in calculation