Fixing borders...