fixing layout and content issues