updated markup
ref-factored for jquery