- improved layouts
- Added images & labels
- fixed bug unmarshalling layouts