Creating Hyperlinks plus other changes