Added calc controller/views