Added back missing borders