Changed index-page.
Merge with Stellan
Merge with Stellan