Revert "Pag BTN fixes"

This reverts commit 138d9920a7473e16237f6cd3a15472e21c8a9e5a.
Improved pag BTNs