Fixed span issue with create buttons