Fattended up all the figures and some borders