changed geometry files
changed parameters layout
fixed merge conflict from github