Add formulae, fix layout and typos, arrange images