Improved/added shortcodes, tweaked CSS