Improved link functiionality and fixed FF bug