Added seperators and fixed links