[imp]:improve tax calculation and view