Shortcodes:
- refactoring and fixes