slight change to layout and url handling