Improvments

Function OnDraw.
Will not work yet, need to me implemented.