20140529 chapter5 commit
Finish layout and routers