Clean up layout markup
Add new values to db
Add preliminary routes