Updated admin form layouts