Fixed problem with buttons