Jira issue SCHOOLBR-48, More polish