First layout fix attempt