Updated layouts so that print layout is available.
Also introduced some minor tweaks.