jQuery Wrapper & Simplify DOM

Created jQuery parameter wrapper and simplified DOM structure to one
tag for auto-generation of code