Made lots of improvements and fixes. Changed up the content flow.