Fixed issue #10 - some forms design