Task #163: Fixed error display arrows in firefox
Task #163: Fixed merge conflict