Cleaned up Navigation.js