Added more formatting, starting on links