Reassembling all the changes. Adding additional layout files.