Simplified layout
Finish layout and routes
Cleaned up static_pages_spec to condense and remove repetition