[DEV] Start rework of the button