capifony and html fixes

great :)
could you provide  a PR for those 2 double ass.?