Closes #76 - adds correct admin tabs and new data structure and upgrade function