pop button added

* code clean-up