revision to the first post, second post and second layout (yes that's too much for a single commit, I know :'(