Fix buttons.
Cleanup structure.