Few small changes of style names and display shortcode