Added links and editted layouts