updates #167 #119

Layout improvements
updates #52