Simplified Button Markup, added shortcode option

Cleaned up button markup and added an option to implement the button in a shortcode (function 7)