fixed wrapper classes
fixed it for collections too
Removed the 'inline' option. Adjusted some views