Link saving implemented
Code reviewed items fixed