Fixing links and small style changes
Merging changes