--- trunk/lib/Frey/Web/Button.pm	2008/07/14 23:39:56	128
+++ trunk/lib/Frey/Web/Button.pm	2008/07/14 23:44:18	129
@@ -8,7 +8,7 @@
 
 =head1 SYNOPSIS
 
-  extends 'Frey::Web::Button';
+  with 'Frey::Web::Button';
 
 =head1 DESCRIPTION
 
@@ -17,12 +17,10 @@
 =cut
 
 use Data::Dump qw/dump/;
-use Moose;
-extends 'Frey';
-with 'Frey::Web::Field';
+use Moose::Role;
 
 # List of callbacks, buttons for now
-has callback => ( is => 'rw', default => sub {{}} );
+has callback => ( is => 'rw', isa => 'HashRef', default => sub {{}} );
 has callback_order => ( is => 'rw', isa => 'ArrayRef', default => sub { [] });
 
 sub add_button {
@@ -48,7 +46,7 @@
 	$self->callback_order( \@order );
 }
 
-sub render_buttons {
+sub render_callbacks {
 	my ($self) = @_;
 	my $out = '';
 	foreach my $name ( @{ $self->callback_order } ) {
@@ -58,7 +56,7 @@
 	return $out;
 }
 
-sub exec_buttons {
+sub exec_callbacks {
 	my ($self, $f) = @_;
 	foreach my $name (keys %{$self->callback}) {
 		my $btn_name = $self->field_name($name);