Updated self service views links
Minor calendar styling
Merge conflict resolved