Fixed the issues with buttons