cleaned up links
Finish layout and routes