Updates to layout + improved validation.