Added required fields for buttons
Updated wrappers