fix layouts and add content