Add named routes, clean up test scripts end sec 5.3
Finish layout and routes