Disabled links show pointer cursor fixed
Code cleanup
Optimised build
Merge branch 'v3'