Changed names and some minor html generation fix