refactor border labels to labels