Finish layout & routes
added tests