Trying to fix these damn borders