Merged Zaid and Chris' codes for the user front-end
Changes
Fix index.html merge issues