Calculator view working fine

Basic functionality is there but need to spruce things up