Added the rest of the buttons/text fields and added some functionality