refactor layout files to remove warnings