With CSS already in place
Merge branch 'master' into with-blog
Adapt baseurl