As per fix float right in the sidebar, update sidebar and custom layouts to reflect the now non-magicalness of *sidebar, and the fact that all inclusions except _main in *layout cards are by default naked views rather than content.