minor add changes
Finish layouts and routes