Shortcode and minor file changes

Shortcode dummy data and changing a few names.