Deployed, removed calculator, sorting needs fix