Updated layout and routes