Changes to shortcodes and to styling