Added new classes, problems with the border marks