Fixed comment.
CSS broken down and converted to baseline page style
Resolved merge conflicts.
Fixed merge conflicts.
Resolved merge conflicts.