HTML cleanup - removed bad tags, moved input tags inside label tags