more html improvements + prepare for fans