Worked on some of the calculator stuff and a bit of the views