Demos: Removed the content wrappers, header tweaks