Finish layout and routes
delete default index.html
resolve some conflicts