Added support for tabbed forms