* Final adjustments for beta release
* Minor fixes in Layout
* clean up some code