Small fixes, progress with user order page