navigation link handling added
cleaned up