Shoved parts around a bit. Visually more pleasing now.