Finish layout and routes
added .c9 to address merge
addressing merge conflict
addressing merge cnflict