Setup Style update

Changed a few things in the setup style subsection.
Few minor changes in other sections too.