Added navigation buttons
Some minor changes to the datase