File structure change. Buttons refactoring.