Merge to get the latest navbar changes and styling for the tables.