Updates to Feature #81 and Feature #54

Feature #81 - Finished Shortcode & Starting Widget Code
Feature #54 - Re-worked HTML generator to produce better / smoother code