Updated references in navigation
Added Normalize