Make it look less like dookie

Partially fixes #128

Updated routes and other stuff.

Still more cleanup to do!