Tidied a few things up and added some buttons