simplified buttons interrupts and little reorganize in structures