Remove hardcoded namespace
Update gems
Upgrade gems
Use latest helpers from admino