Pretty much finalized the look and feel of the control. Now to make it reusable.
Merge remote-tracking branch 'origin/master'