restructured options machine, improved shortcode generator, css improvements