Forms optimisation and demo update

Version 3.7.0