menu enhancements (multi touch bugfix)
Function clean up (remove all layout stuff)
remove obsolete class files