removing TextButton, moving optional text to generic image/toggle buttons to allow having non-toggle text buttons