refractoring of names of buttons, also quick fix for issue #4