Data Manager gui bug fixes + cleanup