Fix Buttons

Fixes the issues with the buttons