Re-arranged layout.