Navigation added but not working yet