Made some changes to layouts.