added location fields, fixed styling some more, also corrected layout asset use
removed legacy layout file