merged changes form pro
- 3.8 responsive
- more fixes