Refactored Search-fuction and Links.
Merge branch 'Stellan_DevBranch_Week24_Presentation_Old_DB_2' into Publish_Week_25