Arranged stuff to allow for more information and places with longer location names. Much happier with this.
