fix some troubles with buttons