Bjorge html fix + Cleaning