restructured layout, added includes, added subscribe placeholder