generic changes to layout, see #24
rewamp of header, closes #25