changes to main and form-view