Fixing something.
Merge pull request #3 from thenameisnigel/jellybean-dev_layout-wip

Fixing something.