Fix CSS
Custom data feature
Change method to public
Merge branch 'fix-css'