Merge pull request #68 from AshFurrow/mainscreen-contents

@orta => Basics of layout changes done.
use DI for the xauth tokens - fixes #42
Merge pull request #70 from orta/tests

@ashfurrow => use DI for defaults the xauth token tests - fixes #42
Masonry layout.
More work on masonry cells.
More progress on cells.