drastically clean up routing and add buttons!