Fixed bug on clickable buttons