Made some changes to the layout files to fix the warnings about overdraw