changed from form to buttons and random fixes