fixing image model and some form elements