Edited html
Finish layout and routes