Cleanup some blocks

Made badge/button/box more flexible for extensions