Fix shortcode output ordering, fix reg page layout