funky fresh look
Merge branch 'look' into dev
cleaning