Revamp the site based on Nice / baseline