admin layout merger

some layout fixes