Updating navigation to agreed-upon design pattern. Fixed some colors.