Default org unit to GBS, added "Add New" and "Close" buttons