layout fix #3