Change some minor code formatting/styling
Merge branch 'master' into show_user_orders
Add user order pages
Expand tracking of ~user~ orders