RC: reorder routes for more clarity
RC: update the main layout file