Tidying up Admin Page
More changes to database helpers.