Added buttons and a couple other things