Fixed Merge Issues

Be careful when merging since this github program adds some header code
that breaks everything if you don't delete it. Also, fixed the back link
in new user view.