Added Navigation and if statement for nil