Adding changes to layout files
changes after merge