Rehaul of buttons, now starting to integrate the frontend logic