layout changes

peparation for grid/tablet layout
disable automatic activity tracking
Merge pull request #63 from marunjar/dev

merge dev branch