Refined the components so they make more sense.