added missing layout manager
layout
removed obsolete classes