mockup - small style tweaks, added attempts
Merge branch 'master' into dev