Updated views with Stephen's stuff
Resolved route conflicts and stylized signup page