Committing last change bofore doing detail work

After ”design and content” meeting with Sanaz i decided to commit all
work so far. Its a bit messy but this will be cleaned up after next
commit.