Shortcoder redesign 2