Added layout and routes