refactored round buttons code, adapted things accordingly