improved layout
simplify code
Merge branch 'master' of https://github.com/tempo-project/tempo