478 + layout fix