Merging
Merging
Updated css of articleView, fixed links in topbar