Fixed title update
Updated navigation