Demo v 2.0.3 : Forms reorganization