Structures Push buttons & Ground buttons

and small refactoring