Resolve conflict
Proper padding for table header cells and H#
Merge pull request #1164 from pippinsplugins/order-details

Improved spacing for Order Details