Cleaned up xml-files in layout