Add all layers to control CategoryOfQuestion. Small improvements