Made some changes to class layout file