updated with layout fix