added some link functionality
Merge branch 'Alex'