(Bug 4902) Added additional link properties, more CSS clean-up