Tweaked data model
WIP: application guide with icons