UI & Images added
Merge branch 'master' into thomas