Rework layout a bit; add images