* WIP - Fixing loading problems, shortcode functional [ci skip]