Removing border-dark-grey from places where it isn't appropriate