more progress on single issue layout