Re-arranged some of the content