Added calculator ctrl,clean up