fixed more borders