Adds some more information and moves things around again