added buttons needs to be refactored
added buttons needs to be refactored