progress on layout issue