Code cleanup because everything is working so well!

Now have buttons to switch between graph types