jQuery usage bugs & simplify HTML