progress on layout