DF Some styling changes.
DF Fixed NPE in orders.