Markup changes and issues #1487 & #1488 addressed.

Removed automatic legend placement to allow for maximum flexibility in
layout.