Fixing navigation after the merge
Moving change-password from SYSTEM to MY ACCOUNT menu
Moved the wrong link, Arghhh!

I need more tea