working on not flickering
Merge branch 'master' of github.com:wyolum/dashboard