Altered database structure

Changes to admin and mockup.php to deal with revised
sortdata/displaydata/override data scheme