Fix tax on click, update layout