few display fixes and security fix for AgreeData