addes some formatting
fixed adding elements, and order using jquery
fixed conflicts and merged (this is the latest version so far)