change layout and spec
Finish add layout and routes