added buttons and more stuff. not done yet