Changed routes, cleaned up views by making more blocks.