Corrected layout file, fixed name locations