Cleaned up some routes, and added some buttons to pages.  Going to try shallow nested routes next, want a working place to start from