fixed a few layout issues