Changed images
Merge branch 'newfrontend'