Fixed issue with Button creation.