Theme/Layout modifications
Merge pull request #25 from canzalon/develop

Theme/Layout modifications