Applying changes from abstractj to new repo (original commit: 68e0fe6)
Including abstractj's changes to the new AdminUI from sblanc