Returns have been fixed
Added navigation fixes