fixed some stuff, now working with wrapper element