Cleaning up layout files.
Minor changes.