More visual polishing
Reverted back to regular occurrences page link
Merge remote-tracking branch 'origin/design' into design