Restructured scripts / styles and other minor tweaks and changes