Modernizr included to support old browsers
Labels layout fix
Merge branch 'dev'