updates #167 #119

Layout improvements
updates #52
Merge pull request #332 from fgiannar/develop

updates #167 #119 #52