fixed a few layout problems