Added more marks for other buttons. Added checks to buttons so they only work when requirements are met