Massive rate checker refactoring
Clean up main.less
Improve rate checker location default
fix missed merge conflicts
Merge branch 'contolini-dev' into dev