Remove layout file, rename few variables