Add 3x btn
Fix various