some fixes in demo DOM