Revert "Finish layout and routes"

This reverts commit a43739fa89835a01e9c964dc5f1a77e49fc88585.
fixed the db problem, jesus christ