Fixed the draw issue
added visual fixes