Fixed the Navigation issue up to a acceptable level