Better graphics
Merge branch 'gui' into dev