Changed presentation order of information. Fixes #6