all shapes cleaned and border added