improve layout
separete public and private layouts
fix jshint warnings
Merge branch 'improve_layout'