Some structural changes and minor css edits.