fix content layouts and ready to demo