add calc and fix button