Leverage jquery dom manipulation#403

I left the commits just to show the things this PR includes. Please don't merge just yet. 
I would need to remove 387a74f (which i included only to test the build)

why does the order matter?