Fix for #279 , lot of change as we deprecate the use of .button class