Layout fix #2