work in progress on layout