Add shortcodes

Implemented shortcodes