newer layout fix