Correct more links and layout pages
Merge remote-tracking branch 'origin/hot-fix-account-management'