Reposition the buttons on the UI
Merge branch 'develop' of github.com:loganalysis/analytics into develop