Fixed navigational issues