Issue #125: Changes for single page template, Issue #119: IAP stuff..