Fixed ie bubbling

Also added constants to easy change design
Some changes in structure