Added state to button and removed placed and active