Add shortcodes and some beauty fixes