Completed Code optimizations

Improved the Add To My - Option