Numbers fixed & Better frontend HTML indent