Refs #5742 updates layouts being overridden by aalborg to match default theme