collapsed labels -> minor fixes after code review