Updated layout - ready to link JSP