Made most of the changes excluding the footer and FAQ