Updated Config for New Database Configuration

Accomodating changes in the way Database objects are instanciated.
Cleaned up Nav config too.