Updates for post type upper margins
Updates for shortcodes, templates and widget handling