fixed scrolling to effect
fixed layout things
Merge branch 'fix/layour2.0' into develop