Added one page layout mode and custom tags