More refractoring and added ability to use Triggers as regular buttons