Step 2 - fix buttons