Katja's changes to prototype site