bug fixes no layout.