NEW checks , html improvements