Removed the duplicate layout causing crashes