Fixed the bug with the borders. Refactoring of the violation views