few layout fixes