numerous changes including content and layout
Merge pull request #6 from mattbailey0/master

numerous changes including content and layout