Rearranged components so that board is less long.