Quick redesign - WIP
Merge branch 'refresh' into dev
Merge conflicts