more progress on layout made