Task #162: Fixed breadcrums
Task #162: Fixed merge conflict