Added OK and Cancel buttons
Added Group view.