buttons coordination
code cleanup