Fix a few issues with dropdown navigation