Fix few layout issues