master -added functionality for check and x buttons