*8594* Initial commit of review form elements management (needs fixing)