update 20140227
Finish layout and routes