bit more done
Finish layout and routes