Fixed issue while editing Entity, fixed issue in manage toolbar