Fixed broken links and refactored