Renamed some layout stuff.  added some stings.
Merge branch 'master' of https://github.com/Propolandante/clarp_returns