continuing work on layout