Finish layout and routes
Dd
fixes
work
fix