More cleanup, canonicalize <ul> to use dashs