Updates to layout and servlet