Adjusted cell drawing and removed number formatter