Changed design a little for drawing components