Comments to UI classes, tests 14-16, ui and service layer extension