imporved layout somewhat #3