improve Row Shortcode