Added support of different layouts and sidebars