Adjusted DB structure and added new functions to the top navigation