This is Rasin's commit 3 with changes in the user order html file