a few layout fixes