Finish user order page to spec.
Fix merge conflicts