Padrino: Layout improvements
Merge branch 'master' into padrino
Padrino: Layout improvements and edited readme