Fixed drawing borders
Dont insert duplicates