#1: Further site prettyfing