Added Guard
Finish layout and routes