Visual tweaks and fixes
Optimised build