Reorganize menu & navbar