added status button on pop up window
solve merge conflict