Fixed models and refactored the links.