Improved buttons object
Improved flag object