Better about buttons method
Optimised build
Merge branch 'v3'