Fixed some re-direction errors on the profile
Merge https://github.com/GoogleJump/Tardis
Merging required