Clean up layouts, add documentation
Merge pull request #831 from lonelyplanet/if-layouts

Clean up layouts, add documentation