Feature/angular/comment list improvements