Modified components so that i can draw them freely