modify layouts
Finish Layout and routes