Various bug fixes. Started on expand/collapse for greenway list but commenting out because of challenges