added layout and routing