Fix tax on click, update layout
Merge branch 'master' into gh-pages