Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Button heights + few minor fixes
Tidy and improve Firefox-friendly version