few layout issues