save organisation data button added, method refactoring