layout, formatting, tweaks for e-ink displays
Merge branch 'eink'