refactor a little, add preliminary full-page pict