final version, with cleaned up navbar