Created Links utility class. Fix minor errors