Getting rid of button type parameter. Close #28