Removed shortcode module. Edited layouts to be more conistent.