Changed pib_button_base to accept button_type as parameter. Updated all calls to this function to use the global setting for button_type for now.