continuing layout fixes