HOTFIX: Organization form layout