Activity layouts
Merge branch 'master' of github.com:nodnarb/conservo
more layout changes