better layout admin form, small refactor in admin form init