rearrange picture in form
Merge branch 'dev'