Updated layouts, added SIDR support. Permit client update on Brands for demos.