Adding content and fixing links