Cleanup & simplification of presentation data.
Merge branch 'master' of https://github.com/tomazas/semc