Visual tweaks and fixes
Optimised build
Merge branch 'v3'