Section expansion made more dynamic