- better Build layout
- bugfix items controller