Minor element movement

Moved some elements around to (hopefully) look better.